Undo A Git Merge The Easy Way And Then Undo The Undoing!